Merge changes from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 27 Apr 2012 03:13:17 +0000 (11:13 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 27 Apr 2012 03:13:17 +0000 (11:13 +0800)

Trivial merge